Revert part of patch from #166379; don't have gtk_window_present() change

2005-07-26  Elijah Newren  <newren@gmail.com>

	Revert part of patch from #166379; don't have gtk_window_present()
	change a window's desktop, but rather leave it up to the WM.
	(#311653)

	* gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a
	window's workspace

diff --git a/ChangeLog b/ChangeLog
index 5403c10b90e20c1d908e950addf080e376ff73e8..9bebc09b51ee597d75085276799409a7ecaf5f36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-26  Elijah Newren  <newren@gmail.com>
+
+       Revert part of patch from #166379; don't have gtk_window_present()
+       change a window's desktop, but rather leave it up to the WM.
+       (#311653)
+       
+       * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a
+       window's workspace
+
 2005-07-26  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5403c10b90e20c1d908e950addf080e376ff73e8..9bebc09b51ee597d75085276799409a7ecaf5f36 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-07-26  Elijah Newren  <newren@gmail.com>
+
+       Revert part of patch from #166379; don't have gtk_window_present()
+       change a window's desktop, but rather leave it up to the WM.
+       (#311653)
+       
+       * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a
+       window's workspace
+
 2005-07-26  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5403c10b90e20c1d908e950addf080e376ff73e8..9bebc09b51ee597d75085276799409a7ecaf5f36 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-07-26  Elijah Newren  <newren@gmail.com>
+
+       Revert part of patch from #166379; don't have gtk_window_present()
+       change a window's desktop, but rather leave it up to the WM.
+       (#311653)
+       
+       * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a
+       window's workspace
+
 2005-07-26  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 7d0da98eaf5a4dbd297bdceee93aaea9f2ecb181..5d40b2711b4586054003e191259aca93586b59cc 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6048,9 +6048,6 @@ gtk_window_present_with_time (GtkWindow *window,
 #endif
         }
 
-#ifdef GDK_WINDOWING_X11
-      gdk_x11_window_move_to_current_desktop (widget->window);
-#endif
       gdk_window_focus (widget->window, timestamp);
     }
   else